Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 04:35:22 +0000 (20:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 04:35:22 +0000 (20:35 -0800)
commite45e0ddf924d7f9353223d9a884ecf6c0f849434
tree1b4b81c2d268d02466f56454e54fa0be5acf06dc
parentaf8569a68c4b27e390673b110151767b6dc1ddb5
parentfe82f14ff28373f84ba4ccee2d1cd8622d0dd77c
Merge from trunk.
src/ChangeLog
src/s/hpux10-20.h